Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Li Tieguai: Cybersun Edition #2505

Merged
merged 27 commits into from
Dec 6, 2023
Merged

Li Tieguai: Cybersun Edition #2505

merged 27 commits into from
Dec 6, 2023

Conversation

Imaginos16
Copy link
Member

@Imaginos16 Imaginos16 commented Nov 19, 2023 •
edited
Loading

About The Pull Request

This PR reworks and updates the Li Tieguai's design into a Cybersun Ship, as it was outlined in its lore, and what it was slated to become.

2023-11-22 02 00 49

2023-11-22 02 00 50

(SHIP IS NOW FUCKING FLIPPED LET'S GO)

This PR also adds a new job, the Medical Director. It functions exactly as how a CMO would, but for Cybersun instead!

image

Why It's Good For The Game

MEDICAL CYBERSUN SHIP IS FINALLY REAL OH MY GOD.

Changelog

🆑 PositiveEntropy
add: The Li-Tieguai is now officially, a Syndicate ship!
/:cl:

@Imaginos16 Imaginos16 requested review from a team as code owners November 19, 2023 22:52
@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Nov 19, 2023
rye-rice
rye-rice approved these changes Nov 20, 2023
View reviewed changes
Copy link
Member

@rye-rice rye-rice left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sprites are good as usual

Apogee-dev
Apogee-dev requested changes Nov 20, 2023
View reviewed changes
Copy link
Contributor

@Apogee-dev Apogee-dev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm of two minds on the black lobby floors - they fit the Cybersun palette, but they also look pretty intimidating for what's meant to be a ship that assists the general public. You could probably get away with making those floors white, since all the treatment rooms have black floors now. That, or make the hallway black. Trust your gut there I guess.
I don't really have any input on balance here - It looks fine and is pretty much exactly what I would have done, barring the more drastic role shifts I might experiment with later. Good work.

Also, you're missing a maint hatch on the port nacelle.

_maps/configs/syndicate_litieguai.json Outdated Show resolved Hide resolved
@Admiral-Gigaton
Copy link

"Beam me up, scotty!" "Sorry captain, no can do. GLORY TO THE SYNDICATE!!" BAZZZRGGGGG "OH MY GOD AHHHHH HELP HE TELEPORTED ME ONTO A STA-"

Apogee-dev
Apogee-dev requested changes Nov 22, 2023
View reviewed changes
_maps/configs/syndicate_litieguai.json Show resolved Hide resolved
_maps/shuttles/syndicate/syndicate_litieguai.dmm Show resolved Hide resolved
_maps/shuttles/syndicate/syndicate_litieguai.dmm Show resolved Hide resolved
_maps/shuttles/syndicate/syndicate_litieguai.dmm Outdated Show resolved Hide resolved
_maps/shuttles/syndicate/syndicate_litieguai.dmm Outdated Show resolved Hide resolved
_maps/shuttles/syndicate/syndicate_litieguai.dmm Outdated Show resolved Hide resolved
_maps/shuttles/syndicate/syndicate_litieguai.dmm Show resolved Hide resolved
_maps/shuttles/syndicate/syndicate_litieguai.dmm Outdated Show resolved Hide resolved
_maps/shuttles/syndicate/syndicate_litieguai.dmm Show resolved Hide resolved
_maps/shuttles/syndicate/syndicate_litieguai.dmm Outdated Show resolved Hide resolved
Apogee-dev
Apogee-dev requested changes Nov 22, 2023
View reviewed changes
Copy link
Contributor

@Apogee-dev Apogee-dev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missed a few things, sorry.

_maps/shuttles/syndicate/syndicate_litieguai.dmm Outdated Show resolved Hide resolved
_maps/shuttles/syndicate/syndicate_litieguai.dmm Show resolved Hide resolved
_maps/shuttles/syndicate/syndicate_litieguai.dmm Outdated Show resolved Hide resolved
Apogee-dev
Apogee-dev requested changes Nov 22, 2023
View reviewed changes
Copy link
Contributor

@Apogee-dev Apogee-dev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, remove the paramedic/traumateam outfit, since this remap leaves it unused and obsolete.

Apogee-dev
Apogee-dev approved these changes Nov 22, 2023
View reviewed changes
Copy link
Contributor

@Apogee-dev Apogee-dev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ready for TM!

@Apogee-dev Apogee-dev added the Test Merge Candidate You do it for free. label Nov 22, 2023
goober3
goober3 requested changes Nov 22, 2023
View reviewed changes
Copy link
Member

@goober3 goober3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

change out the captain's stamp in the bridge for a syndicate stamp, please.

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Nov 28, 2023
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added Merge Conflict Use Git Hooks, you're welcome. and removed Merge Conflict Use Git Hooks, you're welcome. labels Nov 29, 2023
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 3, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Dec 5, 2023
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Dec 6, 2023
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 6, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added Merge Conflict Use Git Hooks, you're welcome. and removed Merge Conflict Use Git Hooks, you're welcome. labels Dec 6, 2023
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 6, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Dec 6, 2023
@goober3 goober3 added this pull request to the merge queue Dec 6, 2023
Merged via the queue into shiptest-ss13:master with commit e6de474 Dec 6, 2023
10 checks passed
shiptest-server pushed a commit that referenced this pull request Dec 6, 2023
@actions-user
Automatic changelog generation for PR #2505 [ci skip]
b8bab58
MysticalFaceLesS added a commit to CeladonSS13/Shiptest that referenced this pull request Dec 8, 2023
@MysticalFaceLesS
Merge pull request #200 from Mirag1993/Мердж-с-оффами
03b2431 
Li Tieguai: Cybersun Edition (shiptest-ss13#2505)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@goober3 goober3 goober3 approved these changes

@Apogee-dev Apogee-dev Apogee-dev approved these changes

@rye-rice rye-rice rye-rice approved these changes

Assignees
No one assigned
Labels
Code change Watch something violently break. Map Change Tile placing is hard. Thank you for your service. Sprites A bikeshed full of soulless bikes. Test Merge Candidate You do it for free.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Imaginos16 @Admiral-Gigaton @rye-rice @Apogee-dev @goober3